From c6aed7c358b3f1b0e3226ef021c747a8cebe4518 Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Thu, 12 Jan 2006 13:13:34 +0100 Subject: [PATCH] 8604:a51fcb5de470 introduced a discrepancy between the declaration and definition of xc_linux_save(). In particular the argument for the suspend pointer to function was null in one and int in the other. On inspection, int seemed to be correct, so I went with this. I also fixed up a few other cosmetic discrepancies. Signed-Off-By: Horms --- tools/libxc/xc_ia64_stubs.c | 3 ++- tools/libxc/xenguest.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_ia64_stubs.c b/tools/libxc/xc_ia64_stubs.c index 2936415be0..a10992be8e 100644 --- a/tools/libxc/xc_ia64_stubs.c +++ b/tools/libxc/xc_ia64_stubs.c @@ -23,7 +23,8 @@ unsigned long xc_ia64_fpsr_default(void) } int xc_linux_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters, - uint32_t max_factor, uint32_t flags, int (*suspend)(void)) + uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */, + int (*suspend)(int domid)) { PERROR("xc_linux_save not implemented\n"); return -1; diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index c0eb5bcdd3..5cad964f80 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -21,9 +21,9 @@ * @parm dom the id of the domain * @return 0 on success, -1 on failure */ -int xc_linux_save(int xc_handle, int fd, uint32_t dom, uint32_t max_iters, +int xc_linux_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */, - int (*suspend)(int)); + int (*suspend)(int domid)); /** -- 2.30.2